related to landscape images on a page without nailing the width of upright
images to a fix value which makes views for anon unproportional and user
preferences useless
+* (bug 6072) Add a 'border' keyword to the image syntax
== Bugfixes since 1.10 ==
/** @todo document */
function makeImageLinkObj( $nt, $label, $alt, $align = '', $params = array(), $framed = false,
- $thumb = false, $manual_thumb = '', $valign = '', $upright = false, $upright_factor = 0 )
+ $thumb = false, $manual_thumb = '', $valign = '', $upright = false, $upright_factor = 0, $border = false )
{
global $wgContLang, $wgUser, $wgThumbLimits, $wgThumbUpright;
'alt' => $alt,
'longdesc' => $u
);
+
+ $borderStyle = $border ? 'border: solid 1px #dddddd;' : '';
if ( $valign ) {
- $imgAttribs['style'] = "vertical-align: $valign";
+ $imgAttribs['style'] = "$borderStyle vertical-align: $valign";
+ } elseif ( $border ) {
+ $imgAttribs['style'] = "$borderStyle";
}
$linkAttribs = array(
'href' => $u,
# * center center the image
# * framed Keep original image size, no magnify-button.
# * upright reduce width for upright images, rounded to full __0 px
+ # * border draw a 1px border around the image
# vertical-align values (no % or length right now):
# * baseline
# * sub
$mwWidth =& MagicWord::get( 'img_width' );
$mwFramed =& MagicWord::get( 'img_framed' );
$mwUpright =& MagicWord::get( 'img_upright' );
+ $mwBorder =& MagicWord::get( 'img_border' );
$mwPage =& MagicWord::get( 'img_page' );
$caption = '';
$framed = $thumb = false;
$upright = false;
$upright_factor = 0;
+ $border = false;
$manual_thumb = '' ;
$align = $valign = '';
$sk = $this->mOptions->getSkin();
} elseif ( !is_null( $match = $mwUpright->matchVariableStartToEnd( $val ) ) ) {
$upright = true;
$upright_factor = floatval( $match );
+ } elseif ( !is_null( $mwBorder->matchVariableStartToEnd( $val ) ) ) {
+ $border = true;
} elseif ( ! is_null( $match = $mwManualThumb->matchVariableStartToEnd($val) ) ) {
# use manually specified thumbnail
$thumb=true;
$alt = Sanitizer::stripAllTags( $alt );
# Linker does the rest
- return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign, $upright, $upright_factor );
+ return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign, $upright, $upright_factor, $border );
}
/**
'img_framed' => array( 1, 'framed', 'enframed', 'frame' ),
'img_page' => array( 1, 'page=$1', 'page $1' ),
'img_upright' => array( 1, 'upright', 'upright=$1', 'upright $1' ),
+ 'img_border' => array( 1, 'border' ),
'img_baseline' => array( 1, 'baseline' ),
'img_sub' => array( 1, 'sub' ),
'img_super' => array( 1, 'super', 'sup' ),